Merge tag 'upstream/2016.9' into debian/master
authorSimon McVittie <smcv@debian.org>
Tue, 6 Sep 2016 08:14:31 +0000 (09:14 +0100)
committerSimon McVittie <smcv@debian.org>
Tue, 6 Sep 2016 08:14:31 +0000 (09:14 +0100)
commit0922be3ba57b57e7c724d6ad97d81a363e4c6ea9
treea13045b2bddb72b51842dbde1a8dc23d098add2d
parent37c36fe4f7b0e658229c508495ce0f91d60443c5
parent9caebfc8472991e0859995f5a31bf931b6328e6c
Merge tag 'upstream/2016.9' into debian/master

Upstream version 2016.9